Merge tag 'gpsbabel_1_6_0' into upstream
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 26 May 2019 18:54:11 +0000 (20:54 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Sun, 26 May 2019 18:54:11 +0000 (20:54 +0200)

Trivial merge